Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 24 Jul 2010 12:18:05 +0000 (12:18 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 24 Jul 2010 12:18:05 +0000 (12:18 +0000)

Trivial merge